Fixed some printing issues