Fix some room based issues