diff --git a/model-archiver/PyPiDescription.rst b/model-archiver/PyPiDescription.rst
index 7f9ae87d72..20b4040bed 100644
--- a/model-archiver/PyPiDescription.rst
+++ b/model-archiver/PyPiDescription.rst
@@ -1,15 +1,15 @@
 Project Description
 ===================
 
-Torch Model Archiver is a tool used for creating archives of trained neural net models that can be consumed for TorchServe inference.
+Torch Model Archiver is a tool used for creating archives of trained neural net models that can be consumed by TorchServe for inference.
 
-Use the Torch Model Archiver CLI to start create a ``.mar`` file.
+Use the Torch Model Archiver CLI to create a ``.mar`` file.
 
 Torch Model Archiver is part of `TorchServe <https://pypi.org/project/torchserve/>`__.
 However, you can install Torch Model Archiver stand alone.
 
 Detailed documentation and examples are provided in the `README
-<https://github.com/pytorch/serve/model-archiver/README.md>`__.
+<https://github.com/pytorch/serve/blob/master/model-archiver/README.md>`__.
 
 
 Installation
@@ -17,7 +17,7 @@ Installation
 
 ::
 
-    pip install torch-model-archiver
+    python -m pip install torch-model-archiver
 
 Source code
 -----------
diff --git a/model-archiver/setup.py b/model-archiver/setup.py
index 6b5885ff99..4444458576 100644
--- a/model-archiver/setup.py
+++ b/model-archiver/setup.py
@@ -71,9 +71,10 @@ def get_nightly_version():
         description="Torch Model Archiver is used for creating archives of trained neural net models "
         "that can be consumed by TorchServe inference",
         long_description=pypi_description(),
+        long_description_content_type="text/x-rst",
         author="PyTorch Serving team",
         author_email="noreply@noreply.com",
-        url="https://github.com/pytorch/serve/model-archiver/",
+        url="https://github.com/pytorch/serve/blob/master/model-archiver",
         keywords="TorchServe Torch Model Archive Archiver Server Serving Deep Learning Inference AI",
         packages=pkgs,
         install_requires=requirements,
diff --git a/setup.py b/setup.py
index 2f68c30e7d..d5a119ef38 100644
--- a/setup.py
+++ b/setup.py
@@ -167,6 +167,7 @@ def run(self):
         author="PyTorch Serving team",
         author_email="noreply@noreply.com",
         long_description=pypi_description(),
+        long_description_content_type="text/x-rst",
         url="https://github.com/pytorch/serve.git",
         keywords="TorchServe PyTorch Serving Deep Learning Inference AI",
         packages=pkgs,
diff --git a/workflow-archiver/PyPiDescription.rst b/workflow-archiver/PyPiDescription.rst
index 0c6ab2e008..222333a122 100644
--- a/workflow-archiver/PyPiDescription.rst
+++ b/workflow-archiver/PyPiDescription.rst
@@ -3,13 +3,13 @@ Project Description
 
 Torch Workflow Archiver is a tool used for creating archives of workflow designed using trained neural net models that can be consumed by TorchServe inference.
 
-Use the Torch Workflow Archiver CLI to start create a ``.war`` file.
+Use the Torch Workflow Archiver CLI to create a ``.war`` file.
 
 Torch Workflow Archiver is part of `TorchServe <https://pypi.org/project/torchserve/>`__.
 However, you can install Torch Workflow Archiver stand alone.
 
 Detailed documentation and examples are provided in the `README
-<https://github.com/pytorch/serve/workflow-archiver/README.md>`__.
+<https://github.com/pytorch/serve/blob/master/workflow-archiver/README.md>`__.
 
 
 Installation
diff --git a/workflow-archiver/setup.py b/workflow-archiver/setup.py
index ba45622adb..d0cc1f2f1b 100644
--- a/workflow-archiver/setup.py
+++ b/workflow-archiver/setup.py
@@ -75,9 +75,10 @@ def get_nightly_version():
         description="Torch Workflow Archiver is used for creating archives of workflow designed using"
         " trained neural net models that can be consumed by TorchServe inference",
         long_description=pypi_description(),
+        long_description_content_type="text/x-rst",
         author="PyTorch Serving team",
         author_email="noreply@noreply.com",
-        url="https://github.com/pytorch/serve/workflow-archiver/",
+        url="https://github.com/pytorch/serve/blob/master/workflow-archiver/",
         keywords="TorchServe Torch Workflow Archive Archiver Server Serving Deep Learning Inference AI",
         packages=pkgs,
         entry_points={