Changed the way the portable flag uses without supplying a -w argument
Small windows build changes