Fixed additional errors on Windows