Fixes for experimental reporting feature