Fixes and switch to built-in base64 decode