Bugfixes with the new event system.