More cross references in doc