Add fix for PATH and support for bash_completion