More BUILD fixes.