multi-version support fixups