Fix terminator issues.