Some fixes after such a huge merge (master had been brought to the code level of 3.0).