FIX minor bugs in pretty print