More fixes for java viewer performance regression
5 files changed