build fixes and typos