Type tweaks for new reset