more fixes to insertions