Minor Pickup Function corrections