Fixes for Windows users