Fixed printing issues