Fix failing build and typos