Fixes for HPCloud Compute v13.5