1.5.2:
Some fixes