Improve Windows compat + snippet change