Make base64 usage backwards compatible