Lots of changes from the automated schema tools