More fixes for seeking support