Fix Part command, tweak Join command code