Maximization fixes