fixed gradle build issues