Fixed some EDB issues