Partial output improvements