Fixes for windows version.