More cleanup, fixing an error in the fatal-message strings that tried