Fixed some Android Studio warnings