cherry pick invoice tweak
fix fixtures