Fixed room change handling and room removal handling.