More improvements for printability.