Some more bad event fixes