Fixed errors from merge of ViewScene