diff --git a/Makefile b/Makefile
index 90e2b1f..2c0d472 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,8 @@ NIFI-$(VERSION): nifi-$(NIFI_VERSION) nifi-toolkit-$(NIFI_VERSION)
 	mkdir -p $@/lib
 	mv nifi-$(NIFI_VERSION) $@/lib/nifi
 	mv nifi-toolkit-$(NIFI_VERSION) $@/lib/nifi-toolkit
+	find $@/lib/nifi-toolkit/bin -type f -exec chmod 755 {} \;
+	find $@/lib/nifi-toolkit/classpath -type f -exec chmod 644 {} \;
 
 # Remote dependencies
 validator.jar:
diff --git a/meta/parcel.json b/meta/parcel.json
index 5750d51..9341361 100644
--- a/meta/parcel.json
+++ b/meta/parcel.json
@@ -24,7 +24,7 @@
   "users": {
     "nifi": {
       "longname": "Apache NiFi",
-      "home": "/var/run/nifi",
+      "home": "/var/lib/nifi",
       "shell": "/bin/bash",
       "extra_groups": [ ]
     }