#526: Additional changes