Fixing issues with deletion/modification