minor fixes
prevent some unnecessary schema regeneration
corrections to upgrade renaming function