JAL-779 and some redraw refinements