Fixed some output issues