fix some architect troubles