Yet more bugfixes for Update...