An idea I had for ROTJ:R.
Wondering about when they make their way from the battle of Sarlaac and the not forgetting the Droids line. It has been talked about before whether Artoo could end up using his rocket boosters to glide across to the skiff after he knocks Threepio into the sand below. Perhaps there could be a trick where Luke uses the force to carry him aboard or something just to eliminate the slapstick effect?