Address various build issues.