Fixes in redirect