Tried fixing some masonry issues