Scripts/Misc: some small changes after recent commits