Fix room inconsistencies