Fixed issues with this/self and events processing