Fix obvious mistakes, do updates using ROWID