fixes to dep and metrics