Fixed various bugs due to :dado delete