Minor build fixes.