More fixing in the printing code