Minor touchups - found two Ace bug.