Fixes for Whip. Throw. Drop.