Pretty print fixes