Fix compatibility with older command-line tools