Fix some issues for deploying infra