Various fixups and bumps for next release