more fixes for rooms