couple of Builder fixes
couple of Builder fixes

faradayio/ci1,integrity/integrity,erik-escobedo/integrity,forresty/integrity,p/integrity,forresty/integrity,erik-escobedo/integrity,integrity/integrity,p/integrity,integrity/integrity,faradayio/ci1