"fixed" the two remaining issues