Fixes to bring billing report utility script up to date