Build-related fixes.