Fix / updates for bash autocompletion