Bug fixes in Report and Masonry