Still trying to fix deployment bugs