fixes for new schema