ROOMS-333: Bugfixes and improvements