Fix / work around gitbuilder problems