Fixing up connection selection options