Tuning tweaks