Updates for appveyor and fix to Windows issue