More one-pixel gap fixing (still not completely sorted).