"final" fixes for eds