RPT Spam fixes