6769 Getting rid of some RIS errors/warnings