Fix room info handling