Changes to fix alpha_report bvalidator