Minor reordering of room commands