Minor Windows SConstruct & Build fixes

Minor SConstruct fixes, and formatting

os_thread.c build fix