windows compat + cli fix