Fixes for WIN