Address a couple of build issues (windows related)