Some fixes before report