Fish completion improvements