Modifications to configs which hopefully fix gradle errors for good