A few fixes to get the build working.