A couple of minor build fixes.