Fixes event type issues

Should fix #7