Try to fix deployment issues