Fixed output issues