cross-platform (win) fixes