Fixed gradle build issues