Fix up auto completion and cdpath