Still trying to fix deployment issues