[index][s]: minor tweaks and fixes.