Patch up some issues with printing