Fix formatting and build issues.