Compute service change fixes to enable user level retrviing