Fixes to allow building and minor typos.