Carrierwave + Some bug fixes