Tweak and merge in #161: Room blacklist