Bug fixes

168 jobs for !422 with shields_nbody_vertex in 22 minutes and 43 seconds (queued for 5 seconds)
merge request