Fixes for Android for Base64