Fix the last of the issues with rooms (I hope).