More Guide improvements.