Fix Controller Service calls