Nightly fix

This suite of changes fixes the nightly builds.  [The test you can see is here](http://submit-1.batlab.org/nmi/results/details?groupBy=platform&runID=278915&groupDirection=down&sortDirection=down&sortBy=taskID)

This might also fix some polyphemus failures too.