Minor fixes to Thrift compilation