Room profile fixes
Merge pull request #565 from smogon/d8167ec334854dac93b54a5131f03847

Room profile fixes