INTSAMPLES-134: PR comments and fix for Windows