Various Room/Game fixes