Small fixes to interest viz
(cherry picked from commit b29d8be)