Changes for weaver in 2.4