Make development vars work consistently with production