Bug fixes for report driver