Fix lookups and minor typos