Integrated fixes for the view errors