Fix up create, some changes for update.