fixes for db changes