Corrections to match DB scripts