more masonry fixes