Fix and add some redirections and restrictions