Fixed some ODB bugs