Fixing some issues with redirections and unexpected fields.