Follow up views
Concerns fixes