Fix (hopefully) the last batch of incremental update errors