Pre-Portland tweaks