Some view fixes.