Fixes in services