diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc
index 18848274a..1fa1630ab 100644
--- a/rtengine/rawimage.cc
+++ b/rtengine/rawimage.cc
@@ -767,7 +767,7 @@ float** RawImage::compress_image(unsigned int frameNum, bool freeImage)
                 this->data[row][col] = image[row * width + col][0];
             }
     } else {
-        if(get_maker() == "Sigma" && dng_version) { // Hack to prevent sigma dng files from crashing
+        if((get_maker() == "Sigma" || get_maker() == "Pentax" || get_maker() == "Sony") && dng_version) { // Hack to prevent sigma dng files and dng files from PixelShift2DNG from crashing
             height -= top_margin;
             width -= left_margin;
         }
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 0f0d31c40..b8c422545 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -1298,6 +1298,7 @@ int RawImageSource::interpolateBadPixelsXtrans( PixelsMap &bitmapBads )
                 for(dx = -2, dy = 0; dx <= 2 && !distance2PixelFound; dx += 4)
                     if(ri->XTRANSFC(row, col + dx) == pixelColor) {
                         distance2PixelFound = true;
+                        break;
                     }
 
                 if(!distance2PixelFound)
@@ -1306,6 +1307,7 @@ int RawImageSource::interpolateBadPixelsXtrans( PixelsMap &bitmapBads )
                     for(dx = 0, dy = -2; dy <= 2 && !distance2PixelFound; dy += 4)
                         if(ri->XTRANSFC(row + dy, col) == pixelColor) {
                             distance2PixelFound = true;
+                            break;
                         }
 
                 // calculate the value of its virtual counterpart (marked with a V in above examples)
diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index 1ee09dcf3..0a74cf8c2 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -714,7 +714,7 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
             int wmax = tmpw;
             int hmax = tmph;
 
-            if (ri->get_maker() == "Sigma" && ri->DNGVERSION()) { // Hack to prevent sigma dng files from crashing
+            if ((ri->get_maker() == "Sigma" || ri->get_maker() == "Pentax" || ri->get_maker() == "Sony") && ri->DNGVERSION()) { // Hack to prevent sigma dng files from crashing
                 wmax = (width - 2 - left_margin) / hskip;
                 hmax = (height - 2 - top_margin) / vskip;
             }
diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh
index 1413b5d76..f3ff8d8ca 100644
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@@ -165,11 +165,8 @@ cp /opt/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun"
 # Copy liblensfun to Frameworks
 cp /opt/local/lib/liblensfun.2.dylib "${RESOURCES}/../Frameworks"
 
-# Copy libiomp5 to Frameworks
-cp /opt/local/lib/libomp/libiomp5.dylib "${RESOURCES}/../Frameworks"
-
-# Copy the libiomp5 license into the app bundle
-cp "${PROJECT_SOURCE_DIR}/licenses/osx_libiomp5_LICENSE.txt" "${RESOURCES}"
+# Copy libomp to Frameworks
+cp /opt/local/lib/libomp.dylib "${RESOURCES}/../Frameworks"
 
 # Install names
 find -E "${CONTENTS}" -type f -regex '.*/(rawtherapee-cli|rawtherapee|.*\.(dylib|so))' | while read -r x; do
@@ -207,7 +204,7 @@ plutil -convert binary1 "${CONTENTS}/Info.plist"
 
 # Sign the app
 CODESIGNID="$(cmake .. -LA -N | grep "CODESIGNID" | cut -d "=" -f2)"
-codesign --deep --force -v -s "${CODESIGNID}"  "${APP}"
+codesign --deep --force -v -s "${CODESIGNID}" --timestamp "${APP}"
 spctl -a -vvvv "${APP}"
  
 function CreateDmg {
@@ -237,7 +234,7 @@ function CreateDmg {
     hdiutil create -format UDBZ -fs HFS+ -srcdir "${srcDir}" -volname "${PROJECT_NAME}_${PROJECT_FULL_VERSION}" "${dmg_name}.dmg"
 
     # Sign disk image
-    codesign --deep --force -v -s "${CODESIGNID}" "${dmg_name}.dmg"
+    codesign --deep --force -v -s "${CODESIGNID}" --timestamp "${dmg_name}.dmg"
 
     # Zip disk image for redistribution
     zip "${dmg_name}.zip" "${dmg_name}.dmg" AboutThisBuild.txt