Final changes requested by Claus.