Bug Fixes

* More bug fixes for race event