Fixes for Windows XP