more rps fixes