Tyler's view fixes