Fixed (other) bugs that broke the build.