Improve fish shell support