Fixes for Windows
Word fixes (thanks, Rob)