Minor tweaks.
Switch to using ForceInclude directive on windows.