Fix restrictions on controllers