Fix more insertion errors