Fixed bugs that broke the build.