Fixing some Android Studio warnings