Fixed manifest and gradle