Invoice improvements