Bugfixes for Android (tested on N7).