Two fixes for files in $PATH