Fix deployment issues