Fixed masonry issues