Path and argument fixes.