Views fixes.
Views fixes.