Fixes for appveyor