Make project selector handle MachineContexts and small improvements