Fix for deployment issues