Minor view and policies changes.