Fix room generation