Fix subsystem detection