Fixed service issues