small fixes
Merge branch 'CDB-3913' of github.com:CartoDB/cartodb into CDB-3913