Bugfixes and optimizations in TIS and MOS viewers