CONN-152: Fixed findBugs issues with rank(1-14)