Fixes for windows platfor merged