Scripts/Misc: random fixes