diff --git a/docker-compose.yml b/docker-compose.yml
index 3a57061834..120564daaa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -211,6 +211,7 @@ services:
 
   postgres:
     image: postgres:9.4
+    container_name: tahoe.devstack.postgres
     volumes:
       - postgres_data:/var/lib/postgresql/data
     ports:
@@ -218,6 +219,7 @@ services:
 
   redis:
     image: redis:3.0
+    container_name: tahoe.devstack.redis
     ports:
       - 6379:6379
     volumes:
diff --git a/tahoe.mk b/tahoe.mk
index 3981a5f8d3..97fa035275 100644
--- a/tahoe.mk
+++ b/tahoe.mk
@@ -67,7 +67,7 @@ tahoe.up:  ## Run the devstack with proper Tahoe settings, use instead of `$ mak
 	make dev.up
 	@sleep 1
 	make tahoe.init
-	test -d $(CUSTOMER_THEME_DIR) || (make tahoe.theme.reset && tahoe.theme.compile)
+	test -d $(CUSTOMER_THEME_DIR) || (make tahoe.theme.reset && make tahoe.theme.compile)
 	test -d $(AMC_DIR) || make amc.reset
 	test -f $(AMC_DIR)/amc/.env || make amc.env-file
 	make tahoe.chown
@@ -107,7 +107,6 @@ amc.reset:  ## Removes and re-initialize AMC
 	cd $(AMC_DIR)/amc/ && virtualenv -p python3 env
 	cd $(AMC_DIR)/amc/ && . env/bin/activate && pip install --upgrade pip
 	cd $(AMC_DIR)/amc/ && . env/bin/activate && pip install -r ../requirements/local.txt
-	cd $(AMC_DIR)/amc/ && . env/bin/activate && pip install mysql-python
 
 	cd $(AMC_DIR)/frontend/ && npm install || true