Some tweaks to support octocloud better