More mouse button fixing...