Guideline fixes for Windows shell batch

Fixes #17