In some cases objects might have rigid bodies but aren't in the rigid body group, just add objects to the group then. Also allow changing the rigid body type by using the add acive/passive buttons. This avoids having to remove objects just to change type.