Fix some Windows Server issues