Local changes
Handle redirects properly.