Tweaks to FactoryGirl stuff