Bug corrections in version 3.20