Work around some TenDRA bugs
3 files changed