Fixes for oddb_setup