Minor changes to fix metric gathering.