more ci build fixes