Updates for Windows issues