yet more ci fixes