add minor changes to make master compatible with minimization tool