Integrate comments from Jens.