Last minor tweaks for Passenger 4 support.