Minor project fixes, mainly for Android Studio compatibility