Fixed build problems.

Everything should be working now.