More target-dir replacements