Explicit no-peer/no-state, fix multiple controls