Some minor fixes to edk conversion script