Fix some issues with the backport