Some changes I've forgot about.

Probably they seemed good at the time.
Fix update script and update everything.