Fixes for Android/Clang