more ci fixes