Fix more build issues.

`make clean` still doesn't work right.
Merge pull request #2 from metajack/more-build-fixes

Fix more build issues.