RP edits for 0.4.3/0.4.4 compat