EQC cleanups, based on feedback from Thomas Arts (thanks)
Updates for 2.1.9