Fix small issues with Android