bugfixes on create/delete