Updates to views not rendering and some intl stuff