Redirect fix and misc