carrierwave tweaks - not totally fixed yet