Update, delete, insert fixes