[TW134] - Scripts/ToC5: Fix a couple of things