Fix REST services