Fix problems with EMA expansions