base64 fixes