Small improvements about printing