Addressed mouse bugs