Bash completion fixes