Concrete 2 compatible thrift

* Fixed formatting
* Fixed issues with concrete 2