Fixed gradle scripts