Adopt changes to windows host