Applied latest fixes to the second room