Fixed cartodb errors and cherry server errors