Fixes after namespace changes