Fixes to insert-remove calls