Fix build part 2