Small normalize/reset tweaks.