Implementing some corrections provided by Olaf.