More print fixes