Last minute fixes.