diff --git a/Makefile b/Makefile
index 95c2f8e..0042fae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PY?=python3
+PY?=
 PELICAN?=pelican
 PELICANOPTS=
 
@@ -63,10 +63,10 @@ devserver:
 	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 
 devserver-global:
-	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b 0.0.0.0
+	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -b 0.0.0.0
 
 publish:
 	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
 
 
-.PHONY: html help clean regenerate serve serve-global devserver publish
+.PHONY: html help clean regenerate serve serve-global devserver devserver-global publish 
diff --git a/flake.nix b/flake.nix
index 8840d43..39dccc8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,15 +15,15 @@
       formatter.x86_64-linux = pkgs.nixpkgs-fmt;
       devShells.x86_64-linux.default = pkgs.mkShell {
         packages = [
-          (pkgs.python3.withPackages (py: [
-            py.pelican[markdown]
-            py.markdown
-            py.pelican-sitemap
-            py.pelican-related-posts
-            py.pelican-neighbors
-            py.typogrify
-            py.beautifulsoup4
-          ] ++ py.pelican.optional-dependencies.markdown
+          (pkgs.python3.withPackages (ps: [
+            ps.pelican
+            ps.markdown
+            ps.pelican-sitemap
+            ps.pelican-related-posts
+            ps.pelican-neighbors
+            ps.typogrify
+            ps.beautifulsoup4
+          ] ++ ps.pelican.optional-dependencies.markdown
           ))
         ];
       };