STC fixes