Minor Windows SConstruct & Build fixes
Merge pull request #1268 from markbenvenuto/minor_win_build

Minor Windows SConstruct & Build fixes