diff --git a/src/laybasic/laybasic/layGenericSyntaxHighlighter.cc b/src/laybasic/laybasic/layGenericSyntaxHighlighter.cc
index dbfd011a5..709d3b72f 100644
--- a/src/laybasic/laybasic/layGenericSyntaxHighlighter.cc
+++ b/src/laybasic/laybasic/layGenericSyntaxHighlighter.cc
@@ -31,6 +31,7 @@
 #include <cstdio>
 
 #include <QDomDocument>
+#include <QRegExp>
 
 // #define DEBUG_HIGHLIGHTER
 
@@ -98,7 +99,7 @@ GenericSyntaxHighlighterRuleStringList::GenericSyntaxHighlighterRuleStringList (
   m_min_length = std::numeric_limits<int>::max ();
   for (QList<QString>::const_iterator s = sl.begin (); s != sl.end (); ++s) {
     m_s.insert (*s);
-    m_min_length = std::min (m_min_length, s->length ());
+    m_min_length = std::min (m_min_length, int (s->length ()));
   }
 }
 
diff --git a/src/laybasic/laybasic/layNetlistBrowserPage.cc b/src/laybasic/laybasic/layNetlistBrowserPage.cc
index 61b905767..be42ee672 100644
--- a/src/laybasic/laybasic/layNetlistBrowserPage.cc
+++ b/src/laybasic/laybasic/layNetlistBrowserPage.cc
@@ -720,7 +720,7 @@ static QModelIndex find_next (QTreeView *view, QAbstractItemModel *model, const
     if (has_next) {
 
       QString text = model->data (current, Qt::UserRole).toString ();
-      if (text.indexOf (to_find) >= 0 && ! view->isRowHidden (rows_stack.back ().first, parent_stack.back ())) {
+      if (to_find.indexIn (text) >= 0 && ! view->isRowHidden (rows_stack.back ().first, parent_stack.back ())) {
         return current;
       }
 
diff --git a/src/laybasic/laybasic/laySelectCellViewForm.cc b/src/laybasic/laybasic/laySelectCellViewForm.cc
index 655d923bf..fe2c0eaa0 100644
--- a/src/laybasic/laybasic/laySelectCellViewForm.cc
+++ b/src/laybasic/laybasic/laySelectCellViewForm.cc
@@ -106,7 +106,7 @@ SelectCellViewForm::selected_cellviews () const
   std::vector <int> res;
 
   for (int i = 0; i < int (cvs_lb->count ()); ++i) {
-    if (cvs_lb->isItemSelected (cvs_lb->item (i))) {
+    if (cvs_lb->item (i)->isSelected ()) {
       res.push_back (i);
     }
   }
@@ -118,7 +118,7 @@ int
 SelectCellViewForm::selected_cellview () const
 {
   for (int i = 0; i < int (cvs_lb->count ()); ++i) {
-    if (cvs_lb->isItemSelected (cvs_lb->item (i))) {
+    if (cvs_lb->item (i)->isSelected ()) {
       return i;
     }
   }