A few more memory management RST fixes