Fix build for new namespace