Minor changes suggested by Florian Funke