MinMax, some minor changes