Updates to get the wall production worthy