Fix build part2