minor changes to support some refactoring in overlord-commons