Temporary hardcoding of ECB and other fixes.  Need to revisit.