Small bugfix for the generic overload.
A few small bugfixes.