More billing tweaks