Windows build 'fixes'