Changes needed for the new version of FactoryGirl