fix some hints found by Android Studio code inspection