Fixes for billing statement template after merging in #1071 changes