Further fixes in print