Latest upload fixes.