Fixes two bugs happening because views were cloned too late.