Fixes to PrettyPrinter