Fixes to fish script quoting