Avoid massive process storms and other small fixes