temp fixes for pairing and stat controllers