More tweaks to redirect