diff --git a/src/Cutter.cpp b/src/Cutter.cpp
index da248781..1d1ec7dc 100644
--- a/src/Cutter.cpp
+++ b/src/Cutter.cpp
@@ -2048,7 +2048,7 @@ QList<AnalVTableDescription> CutterCore::getAnalClassVTables(const QString &cls)
 {
     QList<AnalVTableDescription> ret;
 
-    RVector *vtables = r_anal_class_base_get_all(core_->anal, cls.toUtf8().constData());
+    RVector *vtables = r_anal_class_vtable_get_all(core_->anal, cls.toUtf8().constData());
     if (!vtables) {
         return ret;
     }
diff --git a/src/widgets/ClassesWidget.cpp b/src/widgets/ClassesWidget.cpp
index d9195634..9926ee86 100644
--- a/src/widgets/ClassesWidget.cpp
+++ b/src/widgets/ClassesWidget.cpp
@@ -471,6 +471,8 @@ ClassesWidget::ClassesWidget(MainWindow *main, QAction *action) :
 {
     ui->setupUi(this);
 
+    ui->classesTreeView->setIconSize(QSize(10, 10));
+
     proxy_model = new ClassesSortFilterProxyModel(this);
     ui->classesTreeView->setModel(nullptr);
     ui->classesTreeView->sortByColumn(ClassesModel::TYPE, Qt::AscendingOrder);
@@ -537,7 +539,11 @@ void ClassesWidget::on_classesTreeView_doubleClicked(const QModelIndex &index)
     if (!index.isValid())
         return;
 
-    RVA offset = index.data(ClassesModel::OffsetRole).value<RVA>();
+    QVariant offsetData = index.data(ClassesModel::OffsetRole);
+    if(!offsetData.isValid()) {
+        return;
+    }
+    RVA offset = offsetData.value<RVA>();
     Core()->seek(offset);
 }