Testing with physical printer caused a few fixes to be made