subsystem distro and small fix