Fix a couple regressions after masonry refactor.