ROOMS-320: Bugfixes found while creating tests