Misc fixes & cleanups for view indexes