Fixes due to nginx config strategy changes