Tweaks to release and grab logic