Minor fixes in CRUD