More smallish changes from the schema branch to the prep branch.