Somewhat fixed the deployment errors