Fix more printing issues