COF being corrupted is still a big issue... but this commit helps slightly.