Fix more printing/parsing issues.