Fixing up few bugs in core.room.