Fixes to match recent insert changes

We don't always create all the columns