Fixed some issues with type-params (not yet working...)