more fixes and hopefully unbroken ci build