fix some linux/windows complications