Minor adjustments (to put on Windows dev)