Some slim fixes, carrierwave-datamapper update