a couple more fixes
fish changes