Add ViewCount and ViewType fixes