I will take your word for it (again, I have no ability to test on Windows). Do you prefer that changes be made in additional commits or as a rebased branch?