Misc fixes for rankings