Another minor fix for windows and character problems.