Further rank enhancments and fixes