Iowa build contributions

@adrienkaiser @fbudin69500 

Will you please consider these changes soon?  It is hard to keep them up-to-date as you change, and in some cases re-invent, the fixes that re in these patch sets.

Thanks,
Hans