Minor changes related to configure bash-completion