Improved Windows compatiblity