Advanced options and bug fixes for RI