Tweaks to redirect setup