Some edfe fixes