aws-context fix, fish support