Fixed service return values