Fixes for non-unified build.  Fix some more windows bustage.