Bug fixes in current ODR functionality.