Minor changes to Room / Menu classes

N/A