Fixed a few build problems.