Event bug fixes