ROP improvements.