Random event bug fixes