Scripts/Misc: random fixes

Lovely no? :)