masonry and other fixes