Fixes for windows setup