Several types are mismatched and causing implicit conversions.  Fix them
up so the types match.
Signed-off-by: NMartin Kelly <mkelly@xevo.com>
Signed-off-by: NJonathan Cameron <Jonathan.Cameron@huawei.com>