Fixed thrift references