Mafi and Salvi extend Tigers deals