Small fixes in ede and on compilation time