More variables missing defer