Minor changes suggested by Gerd