Last minute fixes