fixes for darwin for new metrics scheme