Fix typo
Fix NPE during updating final ranking