Fixing issues when deploying