Corrections due to library refactoring