some more minor changes to adapt to tier3