Add changes proposed by Viktor.