Some minor updates to the selection subsystem.