Fixes for 1.6.1 (mostly Windows-related)