First set of Mark Leake corrections