diff --git a/MeshObjectInfoPlugin.cc b/MeshObjectInfoPlugin.cc
index cc92eace296f37058528b1524df3041cb43090d5..65edf18b0e6cb3bc506db7e91f6a8f6d653549e2 100644
--- a/MeshObjectInfoPlugin.cc
+++ b/MeshObjectInfoPlugin.cc
@@ -602,15 +602,12 @@ int InfoMeshObjectPlugin::getClosestVertexInFace(MeshT* _mesh, int _face_idx, AC
     int closest_v_idx = 0;
     double dist = DBL_MAX;
 
-    ACG::Vec3d vTemp = ACG::Vec3d(0.0, 0.0, 0.0);
-    typename MeshT::Point p;
-
     for (auto fv_it : OpenMesh::SmartFaceHandle(_face_idx, _mesh).vertices()) {
 
-      p = _mesh->point( fv_it );
 
       // Find closest vertex to selection
-      vTemp = ACG::Vec3d(p[0], p[1], p[2]);
+      const typename MeshT::Point p = _mesh->point( fv_it );
+      const ACG::Vec3d vTemp = ACG::Vec3d(p[0], p[1], p[2]);
       const double temp_dist = (vTemp - _hitPoint).length();
 
       if (temp_dist < dist) {
@@ -746,11 +743,12 @@ InfoMeshObjectPlugin::
       }
     }
 
-    target = ACG::SceneGraph::PICK_FACE;
     if (info_->pickMode->currentIndex() == 1 )
       target = ACG::SceneGraph::PICK_EDGE;
     else if (info_->pickMode->currentIndex() == 2 )
       target = ACG::SceneGraph::PICK_VERTEX;
+    else
+      target = ACG::SceneGraph::PICK_FACE;
 
     if (PluginFunctions::scenegraphPick(target, _clickedPoint, node_idx, target_idx, &hit_point)) {
       BaseObjectData* object;
diff --git a/ValenceHistogramDialog.hh b/ValenceHistogramDialog.hh
index c0dabb5b1241219ba076f06fe67fa1472deb85e6..2bbd626c6be9d885e52add7773d3f4a86ffc4cc1 100644
--- a/ValenceHistogramDialog.hh
+++ b/ValenceHistogramDialog.hh
@@ -52,8 +52,8 @@ class ValenceHistogramDialog: public QDialog, public Ui::ValenceHistogramsDlg {
     Q_OBJECT
 
     public:
-        ValenceHistogramDialog(TriMesh &mesh, QWidget *parent = 0);
-        ValenceHistogramDialog(PolyMesh &mesh, QWidget *parent = 0);
+        explicit ValenceHistogramDialog(TriMesh &mesh, QWidget *parent = 0);
+        explicit ValenceHistogramDialog(PolyMesh &mesh, QWidget *parent = 0);
 
         template<class MeshT> void init(MeshT &mesh);