Make more compatible on more systems