Merge corrections about discretization