Invoice fixes