Fix view errors introduced by upstream changes