More printing fixes