Fix organization link on metrics page
Misc fixes