Minor fixes in metrics logging