Fix more build issues.

`make clean` still doesn't work right.