Fix issues with generic stuff