Various android bugfixes