More work around exit codes