Changes for rhcloud