Fix/typedefs from saulrh