Last minute fixes
Time to go