Fixes to changing hold pickup location