ModelLibrary::some usage fixes