Fixes for new Draft: namespace.