WIP: more ETD fixes