Small indexes fixes