Fixes for the Compute and Provision nodes