diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 9c237b8a0..0dad55059 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -891,7 +891,7 @@ INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('4 Wide', '{ "default":{
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('5 Wide', '{ "default":{"float":"left", "width":"19%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 
 -- We generally don't alter triggers, we drop and re-create them, so let's keep them in a separate file that we can just source in update scripts.
-source @ZM_PATH_DATA@/db/triggers.sql
+source @PKGDATADIR@/db/triggers.sql
 --
 -- Apply the initial configuration
 --
diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 3bde3e859..faa9814b9 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -646,8 +646,8 @@ sub substituteTags {
   $text =~ s/%MEM%/$Monitor->{MonthEvents}/g;
   $text =~ s/%MEA%/$Monitor->{ArchivedEvents}/g;
   $text =~ s/%MP%/$url?view=watch&mid=$Event->{MonitorId}/g;
-  $text =~ s/%MPS%/$url?view=watchfeed&mid=$Event->{MonitorId}&mode=stream/g;
-  $text =~ s/%MPI%/$url?view=watchfeed&mid=$Event->{MonitorId}&mode=still/g;
+  $text =~ s/%MPS%/$url?view=watch&mid=$Event->{MonitorId}&mode=stream/g;
+  $text =~ s/%MPI%/$url?view=watch&mid=$Event->{MonitorId}&mode=still/g;
   $text =~ s/%EP%/$url?view=event&mid=$Event->{MonitorId}&eid=$Event->{Id}/g;
   $text =~ s/%EPS%/$url?view=event&mode=stream&mid=$Event->{MonitorId}&eid=$Event->{Id}/g;
   $text =~ s/%EPI%/$url?view=event&mode=still&mid=$Event->{MonitorId}&eid=$Event->{Id}/g;
diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 989d2b14d..2578d91d4 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -27,6 +27,7 @@
 #include <getopt.h>
 #include <arpa/inet.h>
 #include <glob.h>
+#include <cinttypes>
 
 #include "zm.h"
 #include "zm_db.h"
diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index b4d7e323a..b0d11948a 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -16,6 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */ 
+#include <cinttypes>
 
 #include "zm_ffmpeg.h"
 #include "zm_image.h"
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 601f9f424..b49609d1e 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <arpa/inet.h>
 #include <glob.h>
+#include <cinttypes>
 
 #include "zm.h"
 #include "zm_db.h"
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 6ca8f3f96..3500d716a 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -20,7 +20,7 @@
 
 #define __STDC_FORMAT_MACROS 1
 
-#include <inttypes.h>
+#include <cinttypes>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/zms.cpp b/src/zms.cpp
index 63cbfff5f..e8d20f72f 100644
--- a/src/zms.cpp
+++ b/src/zms.cpp
@@ -19,6 +19,7 @@
 
 #include <sys/ipc.h>
 #include <sys/msg.h>
+#include <cinttypes>
 
 #include "zm.h"
 #include "zm_db.h"
diff --git a/src/zmu.cpp b/src/zmu.cpp
index b902e515e..ca71213d0 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -87,6 +87,7 @@ Options for use with monitors:
 */
 
 #include <getopt.h>
+#include <cinttypes>
 
 #include "zm.h"
 #include "zm_db.h"
diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index 91e671f2e..3794e4645 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -105,10 +105,11 @@ commonprep () {
     fi
 
     # fix 32bit rpm builds
-    patch --dry-run --silent -f -p1 < utils/packpack/setarch.patch
-    if [ $? -eq 0 ]; then
-        patch -p1 < utils/packpack/setarch.patch
-    fi
+    # FIXME: breaks arm rpm builds
+    #patch --dry-run --silent -f -p1 < utils/packpack/setarch.patch
+    #if [ $? -eq 0 ]; then
+    #    patch -p1 < utils/packpack/setarch.patch
+    #fi
 
     # The rpm specfile requires we download each submodule as a tarball then manually move it into place
     # Might as well do this for Debian as well, rather than git submodule init