Windows (and not only) fixes