Fix metric ID types