Merge in fix so that we don't have to do weight on the const root