Some fixes for leave from room