Changes for use on Windows