oss: Fix GCC warning
oss: Fix order of switch options to match priority list

Also remove obsolete items from the input priority list
Rename static port switch labels to "Connector" to match MVC