Merge Base64 into a shim