Fixes to base64