Portability fixes. Mostly for Android.