Bug fixes following OdiScm refactoring