Minor Fixes, still broken on Base64 Read though