Bug fixes
Local deletes