Minor changes for Android 4.3

The most important commit is 3053483. The others are optional ;-)