fix fish issues