Fixes for windows build, render widget merge issue
Fixed merge for conifg.sh