CreateRoom fixes