Prevent some restrictions from being set, refactored migration