BUG001: VS2012 Fix + small changes in event handlers