Fix typos, ensure @base is marked as defined.