General report fixes