fix build and typos