cloud 5.x related fixes