Cloud 4 fixes