Better metrics support, fixed random vector gen