Scripts/Misc: random fixes
Merge pull request #12278 from MitchesD/misc

Scripts/Misc: random fixes