Fixed build issues and typos