Fixed JSON errors, fixed API's to work with Gradle