Fix update-blocks better.