More view based fixes