bugfixes for incermental update