Misc changes for cloudjee integration