viewer fixes