fixes to work with v2.22