Fixes two bugs happening because views where cloned early.