Fix remaining binary compatibility issues in enterprise plugin.