Removed Windows code bits from source
Fix one mistake
Corrections as proposed by Skinkie
Merge pull request #1146 from Borkason/fix-1144

Fix #1144