Fixing several things with new Tangelo version