Fix some printing issues