BPA Invoice tweaks