KISS and Android buildfix.