Fixing helpers to work in windows environment