Fixes for gitian builds