More tweaks for fish shell