Correct various minor oversights