More RVIM tweaks