Accounting for ODL API changes.

Fred, the API seems to be evolving, just made minor tweaks to keep up."