Fixup last for non-null columns