Fixes for db column names