Fix typo and some other build issues.