fixes to both services