Fixes for Mouse class