Fix binary metrics so they properly return NaN when appropriate

Fix binary metrics so they properly return NaN when appropriate #372