Some small modifications so that everything works in Windows