mouse event fixes
merge fix, fixed build