Fixes for ci build errors