Build errors fixed.