Agent changes for windows support