Close #52: Minor cleanups on RSP fixes