Fixed overflow protection
Fixed max delivery timeout