Small build fixes.