Add directives for windows compiler. Add default values not available to win32