Fixing some CI bugs