Grinder shift-click fixes