Fixes and redirect management