Fixes for installer(Windows)