Fix build and sort the types eventually :)