Fixup gradle automation