Add workaround for Kind 2 forward references issue