Views small fixes