fixes after namespace move