GH-18 Fix typos and access errors