Core/Misc: More corrections to guid handling change (2292025)