fix errors with android-18