Small code corrections especially for Windows deployment