Make no-ec compilation work.
9 files changed