Minor tweaks to what is still a masonry poc