Fixes to prior db changes