Shorten CI logs [no ci]
Fix some CI failures