backport fixes'