fixes for backports