7.x.version viewer fixes