Fixes in ComputeService to make it work