Fix bugs in room+corridor generation