More global user-guide fixes