Fixed some android-specific bugs.
Removed ':str' because it won't compile for Android