Fix a bunch of problems with EE node generation.