Update gradle
Fix scaffolds mostly