diff --git a/src/KOKKOS/math_special_kokkos.h b/src/KOKKOS/math_special_kokkos.h
index c177e88574a6a5fb9ddc5acdccf4b562824f2356..88008312bf19a03246e4f100c084954b06658c17 100644
--- a/src/KOKKOS/math_special_kokkos.h
+++ b/src/KOKKOS/math_special_kokkos.h
@@ -42,12 +42,11 @@ namespace MathSpecialKokkos {
   {
     x *= x;
     x *= 1.4426950408889634074; // log_2(e)
-#if defined(__BYTE_ORDER__)
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#if defined(__BYTE_ORDER__) &&  __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
     return (x < 1023.0) ? exp2_x86(-x) : 0.0;
-#endif
-#endif
+#else
     return (x < 1023.0) ? exp2(-x) : 0.0;
+#endif
   }
 
   // x**2, use instead of pow(x,2.0)
diff --git a/src/KOKKOS/neighbor_kokkos.cpp b/src/KOKKOS/neighbor_kokkos.cpp
index 8f334415af25af5040439306c19fb5d640c5db98..1bf3f2ef39dbd6a38b8b438e84982bbf105c1fc5 100644
--- a/src/KOKKOS/neighbor_kokkos.cpp
+++ b/src/KOKKOS/neighbor_kokkos.cpp
@@ -147,9 +147,9 @@ void NeighborKokkos::init_ex_mol_bit_kokkos()
 int NeighborKokkos::check_distance()
 {
   if (device_flag)
-    check_distance_kokkos<LMPDeviceType>();
+    return check_distance_kokkos<LMPDeviceType>();
   else
-    check_distance_kokkos<LMPHostType>();
+    return check_distance_kokkos<LMPHostType>();
 }
 
 template<class DeviceType>
@@ -157,7 +157,7 @@ int NeighborKokkos::check_distance_kokkos()
 {
   typedef DeviceType device_type;
 
-  double delx,dely,delz,rsq;
+  double delx,dely,delz;
   double delta,delta1,delta2;
 
   if (boxcheck) {
diff --git a/src/KOKKOS/pair_buck_coul_cut_kokkos.h b/src/KOKKOS/pair_buck_coul_cut_kokkos.h
index 8bccabf8defc3c9f4e7da6450ddd4d33f13449f8..0b6aba5e9205477639e8b4c572e45c18fde762bf 100644
--- a/src/KOKKOS/pair_buck_coul_cut_kokkos.h
+++ b/src/KOKKOS/pair_buck_coul_cut_kokkos.h
@@ -44,7 +44,9 @@ class PairBuckCoulCutKokkos : public PairBuckCoulCut {
   double init_one(int, int);
 
   struct params_buck_coul{
+    KOKKOS_INLINE_FUNCTION
     params_buck_coul(){cut_ljsq=0;cut_coulsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;};
+    KOKKOS_INLINE_FUNCTION
     params_buck_coul(int i){cut_ljsq=0;cut_coulsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;};
     F_FLOAT cut_ljsq,cut_coulsq,a,c,rhoinv,buck1,buck2,offset;
   };
diff --git a/src/KOKKOS/pair_buck_coul_long_kokkos.h b/src/KOKKOS/pair_buck_coul_long_kokkos.h
index c4af7e19f33b482bddf76b7346c1b4652a133c5e..fe63a2c124d967e1f681d5d39baa571f8e5e2053 100644
--- a/src/KOKKOS/pair_buck_coul_long_kokkos.h
+++ b/src/KOKKOS/pair_buck_coul_long_kokkos.h
@@ -45,7 +45,9 @@ class PairBuckCoulLongKokkos : public PairBuckCoulLong {
   double init_one(int, int);
 
   struct params_buck_coul{
+    KOKKOS_INLINE_FUNCTION
     params_buck_coul(){cut_ljsq=0;cut_coulsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;};
+    KOKKOS_INLINE_FUNCTION
     params_buck_coul(int i){cut_ljsq=0;cut_coulsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;};
     F_FLOAT cut_ljsq,cut_coulsq,a,c,rhoinv,buck1,buck2,offset;
   };
diff --git a/src/KOKKOS/pair_buck_kokkos.h b/src/KOKKOS/pair_buck_kokkos.h
index 6b6e6f793e77c666ae664beb2d5c2719af2cd31f..0b0bbf94cfcef8595d8310df315390ece5d1f6e6 100644
--- a/src/KOKKOS/pair_buck_kokkos.h
+++ b/src/KOKKOS/pair_buck_kokkos.h
@@ -43,7 +43,9 @@ class PairBuckKokkos : public PairBuck {
   double init_one(int, int);
 
   struct params_buck{
+    KOKKOS_INLINE_FUNCTION
     params_buck(){cutsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;};
+    KOKKOS_INLINE_FUNCTION
     params_buck(int i){cutsq=0;a=0;c=0;rhoinv=0;buck1=0;buck2=0;offset=0;};
     F_FLOAT cutsq,a,c,rhoinv,buck1,buck2,offset;
   };
diff --git a/src/KOKKOS/pair_coul_debye_kokkos.h b/src/KOKKOS/pair_coul_debye_kokkos.h
index 1f6d222e043e0daf2623fce3f5b7e838dcc32430..4aadcbe4e1be88fa980d523b6febdc10b046f01e 100644
--- a/src/KOKKOS/pair_coul_debye_kokkos.h
+++ b/src/KOKKOS/pair_coul_debye_kokkos.h
@@ -44,7 +44,9 @@ class PairCoulDebyeKokkos : public PairCoulDebye {
   double init_one(int, int);
 
   struct params_coul{
+    KOKKOS_INLINE_FUNCTION
     params_coul(){cutsq=0,scale=0;};
+    KOKKOS_INLINE_FUNCTION
     params_coul(int i){cutsq=0,scale=0;};
     F_FLOAT cutsq, scale;
   };
diff --git a/src/KOKKOS/pair_lj_class2_kokkos.h b/src/KOKKOS/pair_lj_class2_kokkos.h
index 73865928f5bc25e69e14f355acf1a8af5df4cd4b..ccff6821f3a3c293bd00bd5f211d0bf674ce8e97 100644
--- a/src/KOKKOS/pair_lj_class2_kokkos.h
+++ b/src/KOKKOS/pair_lj_class2_kokkos.h
@@ -44,7 +44,9 @@ class PairLJClass2Kokkos : public PairLJClass2 {
   double init_one(int, int);
 
   struct params_lj{
+    KOKKOS_INLINE_FUNCTION
     params_lj(){cutsq=0,lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};
+    KOKKOS_INLINE_FUNCTION
     params_lj(int i){cutsq=0,lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};
     F_FLOAT cutsq,lj1,lj2,lj3,lj4,offset;
   };
diff --git a/src/KOKKOS/pair_lj_expand_kokkos.h b/src/KOKKOS/pair_lj_expand_kokkos.h
index 125c63852745bacf7c7e09b817d7eef4baffcc2f..ee110bab80d9328d2cdaddf62aeddc5137bcb9ef 100644
--- a/src/KOKKOS/pair_lj_expand_kokkos.h
+++ b/src/KOKKOS/pair_lj_expand_kokkos.h
@@ -44,7 +44,9 @@ class PairLJExpandKokkos : public PairLJExpand {
   double init_one(int, int);
 
   struct params_lj{
+    KOKKOS_INLINE_FUNCTION
     params_lj(){cutsq=0,lj1=0;lj2=0;lj3=0;lj4=0;offset=0;shift=0;};
+    KOKKOS_INLINE_FUNCTION
     params_lj(int i){cutsq=0,lj1=0;lj2=0;lj3=0;lj4=0;offset=0;shift=0;};
     F_FLOAT cutsq,lj1,lj2,lj3,lj4,offset,shift;
   };
diff --git a/src/KOKKOS/pair_lj_gromacs_kokkos.h b/src/KOKKOS/pair_lj_gromacs_kokkos.h
index 4c03bf6e9b99a7646fe52da06bef5472a5f14bd1..1f16409dc5af81db4da551341761a50103b83de1 100644
--- a/src/KOKKOS/pair_lj_gromacs_kokkos.h
+++ b/src/KOKKOS/pair_lj_gromacs_kokkos.h
@@ -44,7 +44,9 @@ class PairLJGromacsKokkos : public PairLJGromacs {
   double init_one(int, int);
 
   struct params_lj{
+    KOKKOS_INLINE_FUNCTION
     params_lj(){cut_inner_sq=0;cut_inner=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;ljsw1=0;ljsw2=0;ljsw3=0;ljsw4=0;ljsw5=0;};
+    KOKKOS_INLINE_FUNCTION
     params_lj(int i){cut_inner_sq=0;cut_inner=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;ljsw1=0;ljsw2=0;ljsw3=0;ljsw4=0;ljsw5=0;};
     F_FLOAT cut_inner_sq,cut_inner,lj1,lj2,lj3,lj4,offset,ljsw1,ljsw2,ljsw3,ljsw4,ljsw5;
   };
diff --git a/src/compute_coord_atom.cpp b/src/compute_coord_atom.cpp
index 1df5ad64ca31872c80bc2d8fdba862d2d9157e26..8c69aa787437131f1f376a29a3db7a99d6290def 100644
--- a/src/compute_coord_atom.cpp
+++ b/src/compute_coord_atom.cpp
@@ -191,7 +191,6 @@ void ComputeCoordAtom::compute_peratom()
       c_orientorder->invoked_flag |= INVOKED_PERATOM;
     }
     nqlist = c_orientorder->nqlist;
-    int ltmp = l;
     normv = c_orientorder->array_atom;
     comm->forward_comm_compute(this);
   }
diff --git a/src/domain.cpp b/src/domain.cpp
index 52ac9d3d1b05fab7bd9c6bc58083820011559e61..1dede69729cad6d13bdcb959eab7cd27f7c84802 100644
--- a/src/domain.cpp
+++ b/src/domain.cpp
@@ -1600,10 +1600,10 @@ int Domain::ownatom(int id, double *x, imageint *image, int shrinkexceed)
     if (coord[0] < blo[0] && boundary[0][0] > 1) newcoord[0] = blo[0];
     else if (coord[0] >= bhi[0] && boundary[0][1] > 1) newcoord[0] = bhi[0];
     else newcoord[0] = coord[0];
-    if (coord[1] < blo[1] && boundary[1][1] > 1) newcoord[1] = blo[1];
+    if (coord[1] < blo[1] && boundary[1][0] > 1) newcoord[1] = blo[1];
     else if (coord[1] >= bhi[1] && boundary[1][1] > 1) newcoord[1] = bhi[1];
     else newcoord[1] = coord[1];
-    if (coord[2] < blo[2] && boundary[2][2] > 1) newcoord[2] = blo[2];
+    if (coord[2] < blo[2] && boundary[2][0] > 1) newcoord[2] = blo[2];
     else if (coord[2] >= bhi[2] && boundary[2][1] > 1) newcoord[2] = bhi[2];
     else newcoord[2] = coord[2];
 
diff --git a/src/library.cpp b/src/library.cpp
index eac8e059ee7f1b386eef4e40f506a6ee81b15d72..992b8ba100d62209f607654baf999c78fa95d039 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -317,8 +317,6 @@ void lammps_free(void *ptr)
 
 int lammps_extract_setting(void *ptr, char *name)
 {
-  LAMMPS *lmp = (LAMMPS *) ptr;
-
   if (strcmp(name,"bigint") == 0) return sizeof(bigint);
   if (strcmp(name,"tagint") == 0) return sizeof(tagint);
   if (strcmp(name,"imageint") == 0) return sizeof(imageint);
diff --git a/src/math_special.h b/src/math_special.h
index 059ef5d3c71dbf0d2acb0da91495875c478f97b9..e4b4998d54fb07fe4f5ad39bbe3e5e2ac4209b59 100644
--- a/src/math_special.h
+++ b/src/math_special.h
@@ -41,12 +41,11 @@ namespace MathSpecial {
   {
     x *= x;
     x *= 1.4426950408889634074; // log_2(e)
-#if defined(__BYTE_ORDER__)
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
     return (x < 1023.0) ? exp2_x86(-x) : 0.0;
-#endif
-#endif
+#else
     return (x < 1023.0) ? exp2(-x) : 0.0;
+#endif
   }
 
   // x**2, use instead of pow(x,2.0)