more CI fixes (i.e. fix segfault on e2 shutdown)