Fixed obvious bug in non-generic type detection, and updated packages