more fixes after domain change