Dumped Maven. Gradle now! Small fixes