Fixes 2

7 jobs for fix2