Altering masonry calls, various minor tweaks.