More metacell issues fixed.