Quick fixes in "major update 1/2"