Header and URL fixes to 4.2 Passport