some RPT fixes