diff --git a/src/RIGID/fix_rigid_nh.cpp b/src/RIGID/fix_rigid_nh.cpp
index 5bf931db62..6bcabe2a7b 100644
--- a/src/RIGID/fix_rigid_nh.cpp
+++ b/src/RIGID/fix_rigid_nh.cpp
@@ -612,7 +612,7 @@ void FixRigidNH::final_integrate()
   
   // sum over atoms to get force and torque on rigid body
   
-  tagint *image = atom->image;
+  int *image = atom->image;
   double **x = atom->x;
   double **f = atom->f;
   int nlocal = atom->nlocal;
diff --git a/src/RIGID/fix_rigid_nh.h b/src/RIGID/fix_rigid_nh.h
index d33541b6f7..4425de399e 100644
--- a/src/RIGID/fix_rigid_nh.h
+++ b/src/RIGID/fix_rigid_nh.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*- ----------------------------------------------------------
+/* ----------------------------------------------------------------------
    LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
    http://lammps.sandia.gov, Sandia National Laboratories
    Steve Plimpton, sjplimp@sandia.gov
@@ -72,7 +72,7 @@ class FixRigidNH : public FixRigid {
   int tcomputeflag,pcomputeflag;
 
   void couple();
-  virtual void remap();  
+  void remap();  
   void nhc_temp_integrate();
   void nhc_press_integrate();
 
diff --git a/src/USER-MISC/pair_nb3b_harmonic.cpp b/src/USER-MISC/pair_nb3b_harmonic.cpp
index da37d3cc07..39dce42468 100644
--- a/src/USER-MISC/pair_nb3b_harmonic.cpp
+++ b/src/USER-MISC/pair_nb3b_harmonic.cpp
@@ -327,7 +327,7 @@ void PairNb3bHarmonic::read_file(char *file)
 
   FILE *fp;
   if (comm->me == 0) {
-    fp = fopen(file,"r");
+    FILE *fp = open_potential(file);
     if (fp == NULL) {
       char str[128];
       sprintf(str,"Cannot open nb3b/harmonic potential file %s",file);
diff --git a/src/XTC/xdr_compat.h b/src/XTC/xdr_compat.h
index d51663a793..d1946ef0af 100644
--- a/src/XTC/xdr_compat.h
+++ b/src/XTC/xdr_compat.h
@@ -60,7 +60,7 @@ extern "C" {
 
 typedef int bool_t;
 
-#if defined(__MINGW32__)
+#if defined(__MINGW32_VERSION)
 typedef char * caddr_t;
 typedef unsigned int u_int;
 #endif