Fixes for IVI-3190 - To get things to render normally