Fixed non-needle metric computations. The non-needle metrics are correct.