Address a few issues that were causing the build to fail.