Fixing last issues before the real day