Fixes a regression introduced by my previous "fix" and a bug with Intel 3000HD under Windows