Last minute fixes, lots of them