Room editor bug fixes