Fixup some issues due to last version bump