gitian build fixes