Fixes for windoze