Fix some issues with fish shell