Bosh suite stability improvements