Minor adjustments to make things work on Windows