Fix view errors after upstream changes