Two RST fixes