Fix output issues