fixes for factories and factory_girl