View fixes and partial delegations.