Additional Print Fixes