Fixed some bugs with deletion tags, etc