Fixes for our custom build to work.