Further deployment issues fixed