Fixed R.java issues