diff --git a/Makefile b/Makefile
index eb93057..e17f999 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ mj-msc.pdf: mj-msc.tex version.inc.tex vars.inc.tex bib.bib \
 
 define FIG_template
 $(1).pdf: layer2img.py Makefile $(2)
-	python ./layer2img.py --outfile=$(1).pdf \
+	python3 ./layer2img.py --outfile=$(1).pdf \
 		$$(if $$($(1)_WIDTHDIV),--widthdiv=$$($(1)_WIDTHDIV)) \
 		$$(if $$($(1)_QUADRANT),--quadrant=$$($(1)_QUADRANT)) \
 		$$(foreach i,1 2 3, \
diff --git a/in-container b/in-container
index edeb8e8..368cca7 100755
--- a/in-container
+++ b/in-container
@@ -10,6 +10,6 @@ fi
 exec docker run -ti --rm \
     --net=host \
     -v /var/run/docker.sock:/var/run/docker.sock \
-    -v ${PWD}:/x \
-    -w /x \
+    -v $(git rev-parse --show-toplevel):/x \
+    -w /x/$(basename ${PWD}) \
     "$NAME" "$@"