[fish]: Various updates