Tweaks to make new namespace work