Fixed some ODN bugs