Few fixes and delete action