Fixes for reports