More build errors fixes.