More gear positioning tweaks