vikasgarghb Make fixes for deployment.