More fixes.

Curse my perfectionism and curse my decision to use shell scripts for this!

refs #18456