More tweaks to the bit that is failing on git