diff --git a/companion/src/modeledit/mixerslist.cpp b/companion/src/modeledit/mixerslist.cpp
index 879383075..3d5e3e3e7 100644
--- a/companion/src/modeledit/mixerslist.cpp
+++ b/companion/src/modeledit/mixerslist.cpp
@@ -75,7 +75,7 @@ bool MixersList::dropMimeData( int index, const QMimeData * data, Qt::DropAction
 */
 void MixersDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    QStyleOptionViewItemV4 options = option;
+    QStyleOptionViewItem options = option;
     initStyleOption(&options, index);
 
     painter->save();
@@ -107,7 +107,7 @@ void MixersDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option
 */
 QSize MixersDelegate::sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const
 {
-    QStyleOptionViewItemV4 options = option;
+    QStyleOptionViewItem options = option;
     initStyleOption(&options, index);
 
     //setup html document
@@ -125,7 +125,7 @@ QSize MixersDelegate::sizeHint ( const QStyleOptionViewItem & option, const QMod
     return QSize(doc.idealWidth(), height);
 }
 
-void MixersDelegate::SetupDocument(QTextDocument & doc, const QStyleOptionViewItemV4 & options) const
+void MixersDelegate::SetupDocument(QTextDocument & doc, const QStyleOptionViewItem & options) const
 {
     //setup html document
     doc.setHtml(options.text);
diff --git a/companion/src/modeledit/mixerslist.h b/companion/src/modeledit/mixerslist.h
index 0dda2a5ca..0a4c990b5 100644
--- a/companion/src/modeledit/mixerslist.h
+++ b/companion/src/modeledit/mixerslist.h
@@ -46,7 +46,7 @@ class MixersDelegate : public QStyledItemDelegate
     QSize sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 
   private:
-    void SetupDocument(QTextDocument & doc, const QStyleOptionViewItemV4 & options) const;
+    void SetupDocument(QTextDocument & doc, const QStyleOptionViewItem & options) const;
 
 };
 
diff --git a/companion/src/mountlist.cpp b/companion/src/mountlist.cpp
index e041a5fe0..7855eab11 100644
--- a/companion/src/mountlist.cpp
+++ b/companion/src/mountlist.cpp
@@ -210,7 +210,7 @@
 #ifdef MOUNTED_GETMNTINFO
 
 # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
-static char *
+static const char *
 fstype_to_string (short int t)
 {
   switch (t)
@@ -305,7 +305,7 @@ fstype_to_string (short int t)
 }
 # endif
 
-static char *
+static const char *
 fsp_to_string (const struct statfs *fsp)
 {
 # if HAVE_STRUCT_STATFS_F_FSTYPENAME