Fixed metrics crashing & Added admin command