Adjustments after Nawal's bug-correction.