Fixes regarding the new namespace