Fixed potential performance issues and a bug with the EventBus.