Some other rank computation changes