Fix update and delete