Included edidel fixes