Fixes on redirect URLs