More bug fixes for rvc, commenting out throw of RuntimeException in indexing code