Last round of fixes before posting.