more minor changes to try to get carrierwave working