misc fixes to fixup the traivs build.