Bugfixes in View events

Fixed bugs from #22