Fixed last of the build bugs.