Minor improvements for A4 Xpress