Small changes according to Manfred's comments