Discretizer fixes