Various changes to support a version bump