Thrift 2360

Fixed outstanding issues with issue 2360