Minor changes to match upstream patch