fixes for room and contract models