Further RST fixes