Fixes to the compute service