Fix room events