Tweaks to pick and place