Commercial Invoice tweaks