Minor changes to work with gradle build tools 2.1