more fixes

3 jobs for fix-ci in 17 minutes and 59 seconds
latest