Fix some errors in 3.28

Romain Vigier requested to merge bugfix/compatibility into master May 30, 2020