Removed some typedefs, and compiles now