Updates to make views compatible with 1.3

Change-Id: Ifa790015750be4198968e4adbbdea949a95c2fc8