More mouse changes