Fixup gradle

Dont merge yet