Improve exec-path handling