RPT Fixes

-Fixes map statements that caused errors