Pushed a fix to mouse with the correct random impl
Fixed some hooks
Merge remote-tracking branch 'upstream/master'