Fix states and redirections according to the new structure of ctrls.