Some fixes with shell completions