Made fixes to have the backports work properly.