Fix GenericImpl constructors